Merge with xen-ia64-unstable.hg
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Tue, 10 Apr 2007 09:29:05 +0000 (10:29 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Tue, 10 Apr 2007 09:29:05 +0000 (10:29 +0100)

Trivial merge